From c25b8e25f524ae33bce84d791a42f8e5621963de Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 5 Jan 2016 07:40:39 -0500
Subject: [PATCH] HighContrast: Some menu fixes

---
 gtk/theme/HighContrast/_common.scss | 34 ++++++++++-----
 gtk/theme/HighContrast/gtk.css      | 68 ++++++++++++++++-------------
 2 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 29c172fc06..a3ed4fdb4a 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -1126,11 +1126,10 @@ treeview.view.progressbar { //Progressbar in treeview cells
 /*********
  * Menus *
  *********/
+menubar,
 .menubar {
   padding: 0px;
-  background-color: mix($fg_color,$bg_color,5%); //Uhm?
-  &:backdrop { background-color: $backdrop_bg_color; }
-  & > .menuitem {
+  & > menuitem {
     padding: 4px 8px;
     &:hover { //Seems like it :hover even with keyboard focus
       box-shadow: inset 0 -3px $selected_bg_color;
@@ -1145,11 +1144,14 @@ treeview.view.progressbar { //Progressbar in treeview cells
 
 menu,
 .menu {
+  margin: 4px;
   padding: 0px;
   background-color: $base_color;
-  //border: 1px solid $borders_color;
-  .menuitem {
+  border: 1px solid $borders_color;
+  & menuitem {
+    text-shadow: none;
     padding: 4px;
+    min-width: 40px;
     &:hover {
       color: $selected_fg_color;
       background-color: $selected_bg_color;
@@ -1163,23 +1165,31 @@ menu,
       background-color: $backdrop_base_color;
     }
     //submenu indicators
-    &.arrow { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); }
-    &.arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }
-  }
-
-  menuitem {
-    min-width: 40px;
     & arrow {
-      margin-left: 10px;
       min-height: 16px;
       min-width: 16px;
     }
+    & arrow:dir(ltr) {
+      -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
+      margin-left: 10px;
+    }
     & arrow:dir(rtl) {
+      -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl');
       margin-right: 10px;
     }
   }
 }
 
+menuitem {
+  & check,
+  & radio {
+    min-height: 16px;
+    min-width: 16px;
+    &:dir(ltr) { margin-right: 7px; }
+    &:dir(rtl) { margin-left: 7px; }
+  }
+}
+
 /***************
  * Popovers   *
  ***************/
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index fb69a96494..a8d5a5cfba 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -1255,60 +1255,68 @@ treeview.view.progressbar {
 /*********
  * Menus *
  *********/
+menubar,
 .menubar {
-  padding: 0px;
-  background-color: #f2f2f2; }
-  .menubar:backdrop {
-    background-color: #fff; }
-  .menubar > .menuitem {
+  padding: 0px; }
+  menubar > menuitem,
+  .menubar > menuitem {
     padding: 4px 8px; }
-    .menubar > .menuitem:hover {
+    menubar > menuitem:hover,
+    .menubar > menuitem:hover {
       box-shadow: inset 0 -3px #000;
       color: #000; }
-    .menubar > .menuitem:disabled {
+    menubar > menuitem:disabled,
+    .menubar > menuitem:disabled {
       color: gray;
       box-shadow: none; }
 
 menu,
 .menu {
+  margin: 4px;
   padding: 0px;
-  background-color: #fff; }
-  menu .menuitem,
-  .menu .menuitem {
-    padding: 4px; }
-    menu .menuitem:hover,
-    .menu .menuitem:hover {
+  background-color: #fff;
+  border: 1px solid gray; }
+  menu menuitem,
+  .menu menuitem {
+    text-shadow: none;
+    padding: 4px;
+    min-width: 40px; }
+    menu menuitem:hover,
+    .menu menuitem:hover {
       color: #fff;
       background-color: #000; }
-    menu .menuitem:disabled,
-    .menu .menuitem:disabled {
+    menu menuitem:disabled,
+    .menu menuitem:disabled {
       color: gray; }
-      menu .menuitem:disabled:backdrop,
-      .menu .menuitem:disabled:backdrop {
+      menu menuitem:disabled:backdrop,
+      .menu menuitem:disabled:backdrop {
         color: gray; }
-    menu .menuitem:backdrop, menu .menuitem:backdrop:hover,
-    .menu .menuitem:backdrop,
-    .menu .menuitem:backdrop:hover {
+    menu menuitem:backdrop, menu menuitem:backdrop:hover,
+    .menu menuitem:backdrop,
+    .menu menuitem:backdrop:hover {
       color: #000;
       background-color: #fff; }
-    menu .menuitem.arrow,
-    .menu .menuitem.arrow {
-      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
-    menu .menuitem.arrow:dir(rtl),
-    .menu .menuitem.arrow:dir(rtl) {
-      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
-  menu menuitem,
-  .menu menuitem {
-    min-width: 40px; }
     menu menuitem arrow,
     .menu menuitem arrow {
-      margin-left: 10px;
       min-height: 16px;
       min-width: 16px; }
+    menu menuitem arrow:dir(ltr),
+    .menu menuitem arrow:dir(ltr) {
+      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+      margin-left: 10px; }
     menu menuitem arrow:dir(rtl),
     .menu menuitem arrow:dir(rtl) {
+      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
       margin-right: 10px; }
 
+menuitem check, menuitem radio {
+  min-height: 16px;
+  min-width: 16px; }
+  menuitem check:dir(ltr), menuitem radio:dir(ltr) {
+    margin-right: 7px; }
+  menuitem check:dir(rtl), menuitem radio:dir(rtl) {
+    margin-left: 7px; }
+
 /***************
  * Popovers   *
  ***************/
-- 
2.30.2